From 06eba1899f6ee0d39841fa2818cbbc8bb30a799e Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 1 Aug 2012 08:41:17 +0000
Subject: [PATCH] debian-opt

Gbp-Pq: Name debian-opt.diff
---
 configure.in             | Bin 344117 -> 344289 bytes
 set_soenv.in             |   1 +
 solenv/inc/unxgcc.mk     |   2 +-
 solenv/inc/unxlngi.mk    |   1 -
 solenv/inc/unxlngm68k.mk |   1 -
 solenv/inc/unxlngmips.mk |   1 -
 solenv/inc/unxlngr.mk    |   1 -
 solenv/inc/unxlngs.mk    |   1 -
 8 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index d01e82ff8f1895e7a8f0ae762894319e33f7cc98..0db6452e63f4a67226e5f52886ed896eafec3fc1 100644
GIT binary patch
delta 201
zcmdnmAo{RTw4sHug{g(Pg=GtCw0V7InnFoxafyO%g@S%*aglyfW}bdZL3X-sQfX#R
zN?J~0da<=aNk(cO7pJp}tD9q}Pl$g&h;0Iz8U<b5^wbgsXEz^5_h1DhJN=Z@GX1>L
zoE(K3h4iA-0tH=H1>JlFr5IiR=x767<JefG1g_MaVy#qEb9McVxY9DY9G&BXL!E*{
TG?46^UKqmYzkRtmYaa&y3Wh%+

delta 30
lcmaFZD7v*lw4sHug{g(Pg=GtCwE6Us5JsQv!4|B2900A83NQcw

diff --git a/set_soenv.in b/set_soenv.in
index a8561cd64d9..e3d48a18e67 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1568,6 +1568,7 @@ ToFile( "COM",               $COM,               "e" );
 ToFile( "COMPATH",           $COMPATH,           "e" );
 ToFile( "CPU",               $CPU,               "e" );
 ToFile( "CPUNAME",           $CPUNAME,           "e" );
+ToFile( "CDEFAULTOPT",       "@CDEFAULTOPT@",    "e" );
 ToFile( "GUI",               $GUI,               "e" );
 ToFile( "GUIBASE",           $GUIBASE,           "e" );
 ToFile( "GVER",              $GVER,              "e" );
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a3231a69d7d..0041a586727 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -31,7 +31,7 @@ ASM*=
 AFLAGS*=
 SOLAR_JAVA*=
 # default optimization level for product code
-CDEFAULTOPT*=-O2
+CDEFAULTOPT*=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | $(GREP) -E -o "\-O[0-3]" || echo "-O2")
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
 ARCH_FLAGS*=
diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index 79c255c326a..40ff07d5947 100644
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -26,7 +26,6 @@
 #*************************************************************************
 
 # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
-CDEFAULTOPT=-Os
 .IF "$(GCCNUMVER)" >= "000400050000"
 ARCH_FLAGS*=-mtune=atom
 .ELSE
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index b6a018a10a1..0d308ec75a9 100644
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -27,7 +27,6 @@
 
 # mk file for Unix Linux m68k using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DM68K
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index 783305d6c9d..2e47da2c4fe 100644
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -27,6 +27,5 @@
 
 # mk file for Unix Linux Mips using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DMIPS
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 81ee90ca4f0..c855716980e 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -27,7 +27,6 @@
 
 # mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index 390244f31d6..9827c22a725 100644
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -29,7 +29,6 @@
 
 ASM=$(CC)
 AFLAGS=-Wa,-K,PIC -c $(CDEFS)
-CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DSPARC
-- 
2.30.2